1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
import * as React from "react"
import { Metadata } from "next"
import { type SearchParams } from "@/types/table"
import { getValidFilters } from "@/lib/data-table"
import { Shell } from "@/components/shell"
import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton"
import { searchParamsPQReviewCache } from "@/lib/pq/validations"
import { getPQSubmissions } from "@/lib/pq/service"
import { PQSubmissionsTable } from "@/lib/pq/pq-review-table-new/vendors-table"
import { InformationButton } from "@/components/information/information-button"
export const metadata: Metadata = {
title: "협력업체 PQ/실사 현황",
description: "",
}
interface PQReviewPageProps {
searchParams: Promise<SearchParams>
}
export default async function PQReviewPage(props: PQReviewPageProps) {
const searchParams = await props.searchParams
const search = searchParamsPQReviewCache.parse(searchParams)
const validFilters = getValidFilters(search.filters)
// 디버깅 로그 추가
console.log("=== PQ Page Debug ===");
console.log("Raw searchParams:", searchParams);
console.log("Raw basicFilters param:", searchParams.basicFilters);
console.log("Raw pqBasicFilters param:", searchParams.pqBasicFilters);
console.log("Parsed search:", search);
console.log("search.filters:", search.filters);
console.log("search.basicFilters:", search.basicFilters);
console.log("search.pqBasicFilters:", search.pqBasicFilters);
console.log("validFilters:", validFilters);
// 기본 필터 처리 (통일된 이름 사용)
let basicFilters = []
if (search.basicFilters && search.basicFilters.length > 0) {
basicFilters = search.basicFilters
console.log("Using search.basicFilters:", basicFilters);
} else if (search.pqBasicFilters && search.pqBasicFilters.length > 0) {
// 하위 호환성을 위해 기존 이름도 지원
basicFilters = search.pqBasicFilters
console.log("Using search.pqBasicFilters:", basicFilters);
} else {
console.log("No basic filters found");
}
// 모든 필터를 합쳐서 처리
const allFilters = [...validFilters, ...basicFilters]
console.log("Final allFilters:", allFilters);
// 조인 연산자도 통일된 이름 사용
const joinOperator = search.basicJoinOperator || search.pqBasicJoinOperator || search.joinOperator || 'and';
console.log("Final joinOperator:", joinOperator);
// Promise.all로 감싸서 전달
const promises = Promise.all([
getPQSubmissions({
...search,
filters: allFilters,
joinOperator,
})
])
return (
<Shell className="gap-4">
<div className="flex items-center justify-between space-y-2">
<div className="flex items-center justify-between space-y-2">
<div>
<div className="flex items-center gap-2">
<h2 className="text-2xl font-bold tracking-tight">
협력업체 PQ/실사 현황
</h2>
<InformationButton pagePath="evcp/pq_new" />
</div>
</div>
</div>
</div>
{/* Items처럼 직접 테이블 렌더링 */}
<React.Suspense
key={JSON.stringify(searchParams)} // URL 파라미터가 변경될 때마다 강제 리렌더링
fallback={
<DataTableSkeleton
columnCount={8}
searchableColumnCount={2}
filterableColumnCount={3}
cellWidths={["10rem", "15rem", "12rem", "12rem", "8rem", "8rem", "10rem", "8rem"]}
shrinkZero
/>
}
>
<PQSubmissionsTable promises={promises} />
</React.Suspense>
</Shell>
)
}
|